From dfd9150a820faa43363be589dfaae095d504f0ad Mon Sep 17 00:00:00 2001 From: Benjamin Otte Date: Sun, 20 Nov 2016 11:19:32 +0100 Subject: [PATCH] build: Don't link against libgtk and libgdk libgdk is statically linked these days, so if you link against it, all of its symbols will exist twice: Once in libgtk.so and once in your binary. --- gtk/Makefile.am | 11 +---------- tests/Makefile.am | 2 -- tests/visuals/Makefile.am | 1 - testsuite/a11y/Makefile.am | 1 - testsuite/a11y/state/Makefile.am | 1 - testsuite/css/Makefile.am | 1 - testsuite/css/nodes/Makefile.am | 1 - testsuite/css/parser/Makefile.am | 1 - testsuite/css/style/Makefile.am | 1 - testsuite/gdk/Makefile.am | 2 +- testsuite/gtk/Makefile.am | 1 - testsuite/reftests/Makefile.am | 1 - 12 files changed, 2 insertions(+), 22 deletions(-) diff --git a/gtk/Makefile.am b/gtk/Makefile.am index d11ba0c6d5..d339227595 100644 --- a/gtk/Makefile.am +++ b/gtk/Makefile.am @@ -1586,8 +1586,6 @@ bin_PROGRAMS = \ gtk4_query_immodules_SOURCES = queryimmodules.c gtkutils.c gtk4_query_immodules_LDADD = \ libgtk-4.la \ - $(top_builddir)/gdk/libgdk-4.la \ - $(top_builddir)/gsk/libgsk-4.la \ $(GMODULE_LIBS) \ $(GTK_DEP_LIBS) @@ -1596,30 +1594,23 @@ gtk4_update_icon_cache_LDADD = $(GDK_PIXBUF_LIBS) gtk4_encode_symbolic_svg_SOURCES = encodesymbolic.c gtk4_encode_symbolic_svg_LDADD = \ + libgtk-4.la \ $(GDK_PIXBUF_LIBS) \ - $(top_builddir)/gdk/libgdk-4.la \ - $(top_builddir)/gsk/libgsk-4.la \ $(GTK_DEP_LIBS) gtk4_builder_tool_SOURCES = gtk-builder-tool.c gtk4_builder_tool_LDADD = \ libgtk-4.la \ - $(top_builddir)/gdk/libgdk-4.la \ - $(top_builddir)/gsk/libgsk-4.la \ $(GTK_DEP_LIBS) gtk4_query_settings_SOURCES = gtk-query-settings.c gtk4_query_settings_LDADD= \ libgtk-4.la \ - $(top_builddir)/gdk/libgdk-4.la \ - $(top_builddir)/gsk/libgsk-4.la \ $(GTK_DEP_LIBS) gtk4_launch_SOURCES = gtk-launch.c gtk4_launch_LDADD = \ libgtk-4.la \ - $(top_builddir)/gdk/libgdk-4.la \ - $(top_builddir)/gsk/libgsk-4.la \ $(GTK_DEP_LIBS) if OS_WIN32 diff --git a/tests/Makefile.am b/tests/Makefile.am index 064f093ec4..8b7b746803 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -17,8 +17,6 @@ DEPS = LDADD = \ $(top_builddir)/gtk/libgtk-4.la \ - $(top_builddir)/gsk/libgsk-4.la \ - $(top_builddir)/gdk/libgdk-4.la \ $(GTK_DEP_LIBS) \ $(GDK_DEP_LIBS) \ -lm diff --git a/tests/visuals/Makefile.am b/tests/visuals/Makefile.am index 43dfa6818e..ec29539d26 100644 --- a/tests/visuals/Makefile.am +++ b/tests/visuals/Makefile.am @@ -13,7 +13,6 @@ DEPS = \ LDADDS = \ $(top_builddir)/gtk/libgtk-4.la \ - $(top_builddir)/gdk/libgdk-4.la \ $(GTK_DEP_LIBS) \ -lm diff --git a/testsuite/a11y/Makefile.am b/testsuite/a11y/Makefile.am index 39f1eb7eba..88cd3fdc40 100644 --- a/testsuite/a11y/Makefile.am +++ b/testsuite/a11y/Makefile.am @@ -16,7 +16,6 @@ AM_CPPFLAGS = \ $(GTK_DEP_CFLAGS) LDADD = \ - $(top_builddir)/gdk/libgdk-4.la \ $(top_builddir)/gtk/libgtk-4.la \ $(GTK_DEP_LIBS) diff --git a/testsuite/a11y/state/Makefile.am b/testsuite/a11y/state/Makefile.am index 42bacebed6..87b69d6462 100644 --- a/testsuite/a11y/state/Makefile.am +++ b/testsuite/a11y/state/Makefile.am @@ -13,7 +13,6 @@ AM_CPPFLAGS = \ $(GTK_DEP_CFLAGS) LDADD = \ - $(top_builddir)/gdk/libgdk-4.la \ $(top_builddir)/gtk/libgtk-4.la \ $(GTK_DEP_LIBS) diff --git a/testsuite/css/Makefile.am b/testsuite/css/Makefile.am index 61e68d50e6..3a2aecfeda 100644 --- a/testsuite/css/Makefile.am +++ b/testsuite/css/Makefile.am @@ -18,7 +18,6 @@ AM_CPPFLAGS = \ $(GTK_DEP_CFLAGS) LDADD = \ - $(top_builddir)/gdk/libgdk-4.la \ $(top_builddir)/gtk/libgtk-4.la \ $(GTK_DEP_LIBS) diff --git a/testsuite/css/nodes/Makefile.am b/testsuite/css/nodes/Makefile.am index 9c24c2a2df..c65fb250d5 100644 --- a/testsuite/css/nodes/Makefile.am +++ b/testsuite/css/nodes/Makefile.am @@ -18,7 +18,6 @@ test_css_nodes_CFLAGS = \ $(NULL) test_css_nodes_LDADD = \ - $(top_builddir)/gdk/libgdk-4.la \ $(top_builddir)/gtk/libgtk-4.la \ $(GTK_DEP_LIBS) \ $(NULL) diff --git a/testsuite/css/parser/Makefile.am b/testsuite/css/parser/Makefile.am index 9f803e6e28..2cc81728f7 100644 --- a/testsuite/css/parser/Makefile.am +++ b/testsuite/css/parser/Makefile.am @@ -19,7 +19,6 @@ test_css_parser_CFLAGS = \ $(GTK_DEP_CFLAGS) test_css_parser_LDADD = \ - $(top_builddir)/gdk/libgdk-4.la \ $(top_builddir)/gtk/libgtk-4.la \ $(GTK_DEP_LIBS) diff --git a/testsuite/css/style/Makefile.am b/testsuite/css/style/Makefile.am index 5340de0abc..56868b5d74 100644 --- a/testsuite/css/style/Makefile.am +++ b/testsuite/css/style/Makefile.am @@ -18,7 +18,6 @@ test_css_style_CFLAGS = \ $(NULL) test_css_style_LDADD = \ - $(top_builddir)/gdk/libgdk-4.la \ $(top_builddir)/gtk/libgtk-4.la \ $(GTK_DEP_LIBS) \ $(NULL) diff --git a/testsuite/gdk/Makefile.am b/testsuite/gdk/Makefile.am index 9315e3e307..b8cbca3e12 100644 --- a/testsuite/gdk/Makefile.am +++ b/testsuite/gdk/Makefile.am @@ -12,7 +12,7 @@ AM_CPPFLAGS = \ LDADD = \ $(GDK_DEP_LIBS) \ - $(top_builddir)/gdk/libgdk-4.la \ + $(top_builddir)/gtk/libgtk-4.la \ $(NULL) #TEST_PROGS += check-gdk-cairo diff --git a/testsuite/gtk/Makefile.am b/testsuite/gtk/Makefile.am index b0a487fdcf..aac128e90b 100644 --- a/testsuite/gtk/Makefile.am +++ b/testsuite/gtk/Makefile.am @@ -21,7 +21,6 @@ DEPS = \ LDADD = \ $(top_builddir)/gtk/libgtk-4.la \ - $(top_builddir)/gdk/libgdk-4.la \ $(GTK_DEP_LIBS) CLEANFILES = diff --git a/testsuite/reftests/Makefile.am b/testsuite/reftests/Makefile.am index 44227dcc83..f5d0a5bc63 100644 --- a/testsuite/reftests/Makefile.am +++ b/testsuite/reftests/Makefile.am @@ -43,7 +43,6 @@ endif libgtkreftestprivate_la_CFLAGS = $(gtk_reftest_CFLAGS) libgtkreftestprivate_la_LDFLAGS = $(no_undefined) libgtkreftestprivate_la_LIBADD = \ - $(top_builddir)/gdk/libgdk-4.la \ $(top_builddir)/gtk/libgtk-4.la \ $(GTK_DEP_LIBS) \ $(GMODULE_LIBS) \ -- 2.30.2